From bc41c3ffcf8d4d13e0fccb107fd70e65ea9af1ef Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 16 Nov 2000 00:16:46 +0000 Subject: [PATCH] remove unecessary rules for win32-specific config-substituted targets. If Wed Nov 15 18:39:40 2000 Owen Taylor * **/Makefile.am : remove unecessary rules for win32-specific config-substituted targets. If you want these rules, use --enable-maintainer-mode (called automatically by autogen.sh). Stops a lot of unneccessary make-time warnings. * gtk/gtktext{layout,display}.c: Factor in total width as well as screen when figuring alignment for word-wrap as well as no wrap; this is necessary to handle lines that cannot be wrapped at all. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-0 | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-2 | 12 ++++++++++++ ChangeLog.pre-2-4 | 12 ++++++++++++ ChangeLog.pre-2-6 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ gdk-pixbuf/Makefile.am | 3 --- gdk-pixbuf/pixops/Makefile.am | 4 ---- gdk/Makefile.am | 3 --- gdk/win32/Makefile.am | 4 ---- gdk/win32/rc/Makefile.am | 3 --- gtk/Makefile.am | 9 --------- gtk/gtktextdisplay.c | 5 ----- gtk/gtktextlayout.c | 9 ++++----- 15 files changed, 88 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index fda558b50f..956403aae0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Wed Nov 15 18:39:40 2000 Owen Taylor + + * **/Makefile.am : remove unecessary rules for win32-specific + config-substituted targets. If you want these rules, use + --enable-maintainer-mode (called automatically by autogen.sh). + Stops a lot of unneccessary make-time warnings. + + * gtk/gtktext{layout,display}.c: Factor in total width as + well as screen when figuring alignment for word-wrap as well as + no wrap; this is necessary to handle lines that cannot be wrapped + at all. + 2000-11-15 Havoc Pennington * gtk/testtext.c: Implement essential color cycling feature diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fda558b50f..956403aae0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,15 @@ +Wed Nov 15 18:39:40 2000 Owen Taylor + + * **/Makefile.am : remove unecessary rules for win32-specific + config-substituted targets. If you want these rules, use + --enable-maintainer-mode (called automatically by autogen.sh). + Stops a lot of unneccessary make-time warnings. + + * gtk/gtktext{layout,display}.c: Factor in total width as + well as screen when figuring alignment for word-wrap as well as + no wrap; this is necessary to handle lines that cannot be wrapped + at all. + 2000-11-15 Havoc Pennington * gtk/testtext.c: Implement essential color cycling feature diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fda558b50f..956403aae0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Wed Nov 15 18:39:40 2000 Owen Taylor + + * **/Makefile.am : remove unecessary rules for win32-specific + config-substituted targets. If you want these rules, use + --enable-maintainer-mode (called automatically by autogen.sh). + Stops a lot of unneccessary make-time warnings. + + * gtk/gtktext{layout,display}.c: Factor in total width as + well as screen when figuring alignment for word-wrap as well as + no wrap; this is necessary to handle lines that cannot be wrapped + at all. + 2000-11-15 Havoc Pennington * gtk/testtext.c: Implement essential color cycling feature diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fda558b50f..956403aae0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,15 @@ +Wed Nov 15 18:39:40 2000 Owen Taylor + + * **/Makefile.am : remove unecessary rules for win32-specific + config-substituted targets. If you want these rules, use + --enable-maintainer-mode (called automatically by autogen.sh). + Stops a lot of unneccessary make-time warnings. + + * gtk/gtktext{layout,display}.c: Factor in total width as + well as screen when figuring alignment for word-wrap as well as + no wrap; this is necessary to handle lines that cannot be wrapped + at all. + 2000-11-15 Havoc Pennington * gtk/testtext.c: Implement essential color cycling feature diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fda558b50f..956403aae0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Wed Nov 15 18:39:40 2000 Owen Taylor + + * **/Makefile.am : remove unecessary rules for win32-specific + config-substituted targets. If you want these rules, use + --enable-maintainer-mode (called automatically by autogen.sh). + Stops a lot of unneccessary make-time warnings. + + * gtk/gtktext{layout,display}.c: Factor in total width as + well as screen when figuring alignment for word-wrap as well as + no wrap; this is necessary to handle lines that cannot be wrapped + at all. + 2000-11-15 Havoc Pennington * gtk/testtext.c: Implement essential color cycling feature diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fda558b50f..956403aae0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Wed Nov 15 18:39:40 2000 Owen Taylor + + * **/Makefile.am : remove unecessary rules for win32-specific + config-substituted targets. If you want these rules, use + --enable-maintainer-mode (called automatically by autogen.sh). + Stops a lot of unneccessary make-time warnings. + + * gtk/gtktext{layout,display}.c: Factor in total width as + well as screen when figuring alignment for word-wrap as well as + no wrap; this is necessary to handle lines that cannot be wrapped + at all. + 2000-11-15 Havoc Pennington * gtk/testtext.c: Implement essential color cycling feature diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fda558b50f..956403aae0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Wed Nov 15 18:39:40 2000 Owen Taylor + + * **/Makefile.am : remove unecessary rules for win32-specific + config-substituted targets. If you want these rules, use + --enable-maintainer-mode (called automatically by autogen.sh). + Stops a lot of unneccessary make-time warnings. + + * gtk/gtktext{layout,display}.c: Factor in total width as + well as screen when figuring alignment for word-wrap as well as + no wrap; this is necessary to handle lines that cannot be wrapped + at all. + 2000-11-15 Havoc Pennington * gtk/testtext.c: Implement essential color cycling feature diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 02967bf726..a63e99fecb 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -199,6 +199,3 @@ EXTRA_DIST = \ pixbufloader_png.def \ pixbufloader_tiff.def \ pixbufloader_wbmp.def - -makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk-pixbuf/makefile.mingw.in - cd $(top_builddir) && CONFIG_FILES=gdk-pixbuf/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am index f799f42ffc..4e12319862 100644 --- a/gdk-pixbuf/pixops/Makefile.am +++ b/gdk-pixbuf/pixops/Makefile.am @@ -25,7 +25,3 @@ EXTRA_DIST = \ DETAILS \ makefile.mingw \ makefile.mingw.in - -makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk-pixbuf/pixops/makefile.mingw.in - cd $(top_builddir) && CONFIG_FILES=gdk-pixbuf/pixops/$@ CONFIG_HEADERS= $(SHELL) ./config.status - diff --git a/gdk/Makefile.am b/gdk/Makefile.am index d856016ff4..391abdd219 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -180,9 +180,6 @@ stamp-gc-h: ../config.status cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status echo timestamp > stamp-gc-h -makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk/makefile.mingw.in - cd $(top_builddir) && CONFIG_FILES=gdk/$@ CONFIG_HEADERS= $(SHELL) ./config.status - .PHONY: files files: diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index 3c4d2b4d4f..bd2b86ece0 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -26,7 +26,3 @@ EXTRA_DIST = \ gdkwin32id.c \ gdkwindow-win32.c \ surrogate-dimm.h - -makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk/win32/makefile.mingw.in - cd $(top_builddir) && CONFIG_FILES=gdk/win32/$@ CONFIG_HEADERS= $(SHELL) ./config.status - diff --git a/gdk/win32/rc/Makefile.am b/gdk/win32/rc/Makefile.am index 2ed6aeac08..42bdbd6a9d 100644 --- a/gdk/win32/rc/Makefile.am +++ b/gdk/win32/rc/Makefile.am @@ -79,6 +79,3 @@ EXTRA_DIST = \ cursor94.cur \ cursor96.cur \ cursor98.cur - -gdk.rc: $(top_builddir)/config.status $(top_srcdir)/gdk/win32/rc/gdk.rc.in - cd $(top_builddir) && CONFIG_FILES=gdk/win32/rc/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/gtk/Makefile.am b/gtk/Makefile.am index bf67efe55c..262dd0a2e6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -607,15 +607,6 @@ testdnd_LDADD = $(LDADDS) simple_LDADD = $(LDADDS) #testthreads_LDADD = $(LDADDS) -makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.mingw.in - cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.msc.in - cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -gtk-win32.rc: $(top_builddir)/config.status $(top_srcdir)/gtk/gtk-win32.rc.in - cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status - .PHONY: files test test-debug files: diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c index 104a278ecf..be82c677e1 100644 --- a/gtk/gtktextdisplay.c +++ b/gtk/gtktextdisplay.c @@ -466,11 +466,6 @@ render_para (GdkDrawable *drawable, layout_logical.y += line_display->top_margin * PANGO_SCALE; screen_width = line_display->total_width; - if (screen_width < 0) - { - screen_width = pango_layout_get_width (layout); - screen_width = PANGO_PIXELS (screen_width); - } do { diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 01d76ddab3..68e2d0abbd 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -1132,14 +1132,14 @@ set_para_values (GtkTextLayout *layout, case GTK_WRAPMODE_CHAR: /* FIXME: Handle this; for now, fall-through */ case GTK_WRAPMODE_WORD: - display->total_width = -1; layout_width = layout->screen_width - display->left_margin - display->right_margin; pango_layout_set_width (display->layout, layout_width * PANGO_SCALE); break; case GTK_WRAPMODE_NONE: - display->total_width = MAX (layout->screen_width, layout->width) - display->left_margin - display->right_margin; break; } + + display->total_width = MAX (layout->screen_width, layout->width) - display->left_margin - display->right_margin; } static PangoAttribute * @@ -1790,10 +1790,9 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout, pango_layout_get_extents (display->layout, NULL, &extents); - if (display->total_width >= 0) - display->x_offset += (display->total_width - PANGO_PIXELS (extents.width)) * align; + display->x_offset += (display->total_width - PANGO_PIXELS (extents.x + extents.width)) * align; - display->width = PANGO_PIXELS (extents.width) + display->x_offset + display->right_margin; + display->width = PANGO_PIXELS (extents.width) + display->left_margin + display->right_margin; display->height += PANGO_PIXELS (extents.height); /* Free this if we aren't in a loop */ -- 2.30.2